socket: Merge gtksocket-x11.c back into gtksocket.c
authorBenjamin Otte <otte@redhat.com>
Fri, 28 Jan 2011 12:02:52 +0000 (13:02 +0100)
committerBenjamin Otte <otte@redhat.com>
Fri, 28 Jan 2011 16:06:07 +0000 (17:06 +0100)
commitb8895cf91036915c8e053dafd6228f19353ceec3
tree8f5ae5b2327c572dc86b42e9f70cb0b86f8afdf7
parent1d804004785fb78df40d95afefa0235f39bed5b2
socket: Merge gtksocket-x11.c back into gtksocket.c
gtk/Makefile.am
gtk/gtksocket-x11.c [deleted file]
gtk/gtksocket.c
gtk/gtksocketprivate.h